Deprecate h/v buttonbox subclasses

This has been discussed in bug 541009.

diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c
index c2164da641b61b48d4026acd3bac6c59dd1e9602..8bb4fba21d67a9872f84f9871d8cf66923a5afb0 100644 (file)
--- a/gtk/gtkhbbox.c
+++ b/gtk/gtkhbbox.c
@@ -25,6 +25,7 @@
  */
 
 #include "config.h"
+#undef GTK_DISABLE_DEPRECATED
 #include "gtkhbbox.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
@@ -53,6 +54,8 @@
  * The spacing between buttons can be set with gtk_box_set_spacing(). The
  * arrangement and layout of the buttons can be changed with
  * gtk_button_box_set_layout().
+ *
+ * GtkHButtonBox has been deprecated, use #GtkButtonBox instead.
  */
 
 
@@ -76,6 +79,8 @@ gtk_hbutton_box_init (GtkHButtonBox *hbutton_box)
  * Creates a new horizontal button box.
  *
  * Returns: a new button box #GtkWidget.
+ *
+ * Deprecated: 3.2: Use gtk_button_box_new() with %GTK_ORIENTATION_HORIZONTAL instead
  */
 GtkWidget *
 gtk_hbutton_box_new (void)

diff --git a/gtk/gtkhbbox.h b/gtk/gtkhbbox.h
index c6f9023bedff127db906592158c0af9180cb1a62..54edf8696c027cca353262abba12051fc69d6efd 100644 (file)
--- a/gtk/gtkhbbox.h
+++ b/gtk/gtkhbbox.h
@@ -31,6 +31,7 @@
 #ifndef __GTK_HBUTTON_BOX_H__
 #define __GTK_HBUTTON_BOX_H__
 
+#ifndef GTK_DISABLE_DEPRECATED
 
 #include <gtk/gtkbbox.h>
 
@@ -64,4 +65,6 @@ GtkWidget* gtk_hbutton_box_new      (void);
 
 G_END_DECLS
 
+#endif
+
 #endif /* __GTK_HBUTTON_BOX_H__ */

diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c
index 2d61ff512e2292ec147114d84fd9eb857754b16a..f234902ee142705a2107c9b54af2dc27810e1c24 100644 (file)
--- a/gtk/gtkvbbox.c
+++ b/gtk/gtkvbbox.c
@@ -25,6 +25,7 @@
  */
 
 #include "config.h"
+#undef GTK_DISABLE_DEPRECATED
 #include "gtkvbbox.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
@@ -53,6 +54,8 @@
  * The spacing between buttons can be set with gtk_box_set_spacing(). The
  * arrangement and layout of the buttons can be changed with
  * gtk_button_box_set_layout().
+ *
+ * GtkVButtonBox has been deprecated, use #GtkButtonBox instead.
  */
 
 G_DEFINE_TYPE (GtkVButtonBox, gtk_vbutton_box, GTK_TYPE_BUTTON_BOX)
@@ -75,6 +78,8 @@ gtk_vbutton_box_init (GtkVButtonBox *vbutton_box)
  * Creates a new vertical button box.
  *
  * Returns: a new button box #GtkWidget.
+ *
+ * Deprecated: 3.2: Use gtk_button_box_new() with %GTK_ORIENTATION_VERTICAL instead
  */
 GtkWidget *
 gtk_vbutton_box_new (void)

diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h
index 3c91a2e6bbe6b07c580a1256e1188e7ec2298ce6..af2fd0a36983e118444b18ff1478b2270a1a1518 100644 (file)
--- a/gtk/gtkvbbox.h
+++ b/gtk/gtkvbbox.h
@@ -31,6 +31,7 @@
 #ifndef __GTK_VBBOX_H__
 #define __GTK_VBBOX_H__
 
+#ifndef GTK_DISABLE_DEPRECATED
 
 #include <gtk/gtkbbox.h>
 
@@ -65,4 +66,6 @@ GtkWidget *gtk_vbutton_box_new      (void);
 
 G_END_DECLS
 
+#endif
+
 #endif /* __GTK_VBBOX_H__ */